Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 19:39:34 +0000 (12:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 19:39:34 +0000 (12:39 -0700)
commit11aeb821bae0ff7b0dae04599e135bd816d97e73
tree0d673c5c20bb764f3a15d0a284e2e62edbfa3094
parent440aedba8a80cd2f5703a11250694dba4a525de5
parente263adbc7ca8f8f396462e660b0b0cc602cde9a6
Merge from trunk.